Adwaita: Don't grow flat entries

Entries in treeviews and similar embedded situations don't really
work well if their height is forced to be big. Take out the min-height
for these.

https://bugzilla.gnome.org/show_bug.cgi?id=761686

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b8d0851212f305de0ad1276c1817eed5f99752e1..47182d5022579081942554275ca0715944c7b362 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -248,6 +248,7 @@ entry {
 
   &.flat,
   &.flat:focus {
+    min-height: 0;
     padding: 2px;
     @include entry(normal, $edge:none);
     border: none;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 98d43507ddffdac5600e0d1de608848ad46628e2..646e8dd2053a1d72ead547bba443e096ef93a3a6 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -195,6 +195,7 @@ entry, spinbutton:not(.vertical) {
     border: none;
     box-shadow: none; }
   entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) {
+    min-height: 0;
     padding: 2px;
     background-color: #292929;
     background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a1a16ff529603261365c6e893f2242cbe757f654..9613a934aa7b9e03fbe7aeff5316c076384d8d7c 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -195,6 +195,7 @@ entry, spinbutton:not(.vertical) {
     border: none;
     box-shadow: none; }
   entry.flat, spinbutton.flat:not(.vertical), entry.flat:focus, spinbutton.flat:focus:not(.vertical) {
+    min-height: 0;
     padding: 2px;
     background-color: #ffffff;
     background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);